Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kubeadm template: Combine apiserver certSANs with extraArgs #6547

Merged
merged 1 commit into from
Feb 7, 2020
Merged

kubeadm template: Combine apiserver certSANs with extraArgs #6547

merged 1 commit into from
Feb 7, 2020

Conversation

tstromberg
Copy link
Contributor

This avoids having a duplicate YAML key that overwrites one another.

Fixes #6543

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 7, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tstromberg

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 7, 2020
@codecov-io
Copy link

Codecov Report

Merging #6547 into master will increase coverage by 0.05%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6547      +/-   ##
==========================================
+ Coverage   37.91%   37.97%   +0.05%     
==========================================
  Files         137      137              
  Lines        8683     8691       +8     
==========================================
+ Hits         3292     3300       +8     
  Misses       4978     4978              
  Partials      413      413
Impacted Files Coverage Δ
pkg/minikube/bootstrapper/bsutil/extraconfig.go 80.82% <100%> (+1.71%) ⬆️
pkg/minikube/bootstrapper/bsutil/kubeadm.go 82.6% <100%> (+0.51%) ⬆️

@tstromberg
Copy link
Contributor Author

/ok-to-test

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Feb 7, 2020
@tstromberg tstromberg mentioned this pull request Feb 7, 2020
Closed
@minikube-pr-bot
Copy link

All Times Minikube (PR 6547): [ 94.238360 92.501832 93.594493]
All Times minikube: [ 92.992519 93.377115 93.947979]

Average minikube: 93.439204
Average Minikube (PR 6547): 93.444895

Averages Time Per Log

+----------------------+-----------+--------------------+
|         LOG          | MINIKUBE  | MINIKUBE (PR 6547) |
+----------------------+-----------+--------------------+
| minikube v           |  0.193047 |           0.195652 |
| Creating kvm2        | 19.983851 |          19.773193 |
| Preparing Kubernetes | 49.949176 |          50.306508 |
| Pulling images       |           |                    |
| Launching Kubernetes | 21.652079 |          21.146929 |
| Waiting for cluster  |  0.060046 |           0.056750 |
+----------------------+-----------+--------------------+

@tstromberg tstromberg requested a review from medyagh February 7, 2020 21:22
medyagh
medyagh approved these changes Feb 7, 2020
View reviewed changes
Copy link
Member

@medyagh medyagh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks for fixing it. this was a mind consuming one for me when I was refactoring for kic

@tstromberg tstromberg merged commit 82326fe into kubernetes:master Feb 7, 2020
@fmotrifork fmotrifork mentioned this pull request Feb 8, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@medyagh medyagh medyagh approved these changes

@afbjorklund afbjorklund Awaiting requested review from afbjorklund

@sharifelgamal sharifelgamal Awaiting requested review from sharifelgamal

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Cannot pass extra config parameters to kube-apiserver
5 participants
@tstromberg @k8s-ci-robot @codecov-io @minikube-pr-bot @medyagh